From 596e129ba84f04cc8957116f8d86ad1ea991ee06 Mon Sep 17 00:00:00 2001
From: jfatherton <jfatherton@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Tue, 3 Feb 2004 05:06:09 +0000
Subject: [PATCH] improved user defaults

---
 .../English.lproj/MainMenu.nib/info.nib       |   4 +-
 .../English.lproj/MainMenu.nib/objects.nib    | Bin 19328 -> 19168 bytes
 gpsbabel/macgpsbabel/MacGPSBabel.applescript  |  36 +-
 .../MacGPSBabel.pbproj/jeremya.pbxuser        | 663 ++++++++++++++++--
 gpsbabel/macgpsbabel/preferences.applescript  |  97 ++-
 5 files changed, 687 insertions(+), 113 deletions(-)

diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
index d4ab31fd7..bfc648b67 100644
--- a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
+++ b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/info.nib
@@ -11,10 +11,10 @@
 	<string>283.0</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
-		<integer>305</integer>
 		<integer>21</integer>
 		<integer>229</integer>
+		<integer>29</integer>
+		<integer>305</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>6R73</string>
diff --git a/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib b/gpsbabel/macgpsbabel/English.lproj/MainMenu.nib/objects.nib
index 619c94cbb66893e5f7cae0685a69ba25b1885f56..7ced0413a4e1ad290131c4dfeb34fa0b3875f9de 100644
GIT binary patch
literal 19168
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

literal 19328
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

diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.applescript b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
index 95763957c..f5b5feb7f 100644
--- a/gpsbabel/macgpsbabel/MacGPSBabel.applescript
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.applescript
@@ -3,7 +3,7 @@
 
 --  Created by Jeremy Atherton on Sun Sep 28 2003.
 --  Last modified Saturday, January 31, 2004.
---  Copyright (c) 2003, 2004 Jeremy Atherton. All rights reserved.
+--  Copyright (c) 2003, 2004 Jeremy Atherton.
 
 -- PROPERTIES AND GLOBALS --
 property fileList : {}
@@ -23,31 +23,16 @@ on awake from nib theObject
 	end if
 end awake from nib
 
--- scripts to deal with opening and closing of SelectGPS window
 on will open theObject
 	if theObject is window "MacGPSBabel" then
 		set p to progress indicator 1 of theObject
 		call method "setStyle:" of p with parameter 1
 		call method "setDisplayedWhenStopped:" of p with parameters {false}
 	end if
-	if theObject is window "SelectGPS" then
-		set popList to my getSerial()
-		delete every menu item of menu of popup button "serialPop" of window "SelectGPS"
-		repeat with i in popList
-			make new menu item at the end of menu items of menu of popup button "serialPop" of window "SelectGPS" with properties {title:i, enabled:true}
-		end repeat
-		set visible of window "MacGPSBabel" to false
-	end if
 end will open
-on will close theObject
-	if theObject is window "SelectGPS" then
-		set visible of window "MacGPSBabel" to true
-	end if
-end will close
 
 -- the 'buisness' scripts, for dealing with all button clicks
 on clicked theObject
-	
 	-- MAIN WINDOW - Select File button
 	if theObject is the button "selectButton" of window "MacGPSBabel" then
 		if contents of text field "inputFile" of window "MacGPSBabel" is equal to "" then
@@ -316,25 +301,6 @@ on GPSSend()
 		set enabled of button "trackSwitch" of window "selectGPS" to true
 	end if
 end GPSSend
--- find the serial ports
-on getSerial()
-	set myList to {}
-	set theScript to "cd /dev; ls | grep cu..."
-	set scriptOut to (do shell script theScript) as string
-	set theCount to count of words in scriptOut
-	set i to 0
-	repeat until i = theCount
-		set i to i + 1
-		set defaultDelimiters to AppleScript's text item delimiters
-		set AppleScript's text item delimiters to {"."}
-		set theWords to the count of text items in word i of scriptOut
-		set z to 2
-		set the end of myList to (text items z thru theWords of word i of scriptOut) as string
-		set AppleScript's text item delimiters to defaultDelimiters
-	end repeat
-	set AppleScript's text item delimiters to {" "}
-	return myList
-end getSerial
 -- deal with uploading files to GPS receiver
 on uploadFile(fileList)
 	-- create string for filters
diff --git a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
index e715018e5..2488ffa89 100644
--- a/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
+++ b/gpsbabel/macgpsbabel/MacGPSBabel.pbproj/jeremya.pbxuser
@@ -13,24 +13,272 @@
 			DA206CF0015C4D9F03C91932,
 		);
 		perUserDictionary = {
-			PBXPerProjectTemplateStateSaveDate = 97363921;
+			PBXPerProjectTemplateStateSaveDate = 97476936;
+			"PBXTemplateGeometry-F5314676015831810DCA290F" = {
+				ContentSize = "{685, 434}";
+				LeftSlideOut = {
+					Collapsed = NO;
+					Frame = "{{0, 23}, {685, 411}}";
+					Split0 = {
+						ActiveTab = 2;
+						Collapsed = NO;
+						Frame = "{{0, 0}, {685, 411}}";
+						Split0 = {
+							Frame = "{{0, 221}, {685, 190}}";
+						};
+						SplitCount = 1;
+						Tab0 = {
+							Debugger = {
+								Collapsed = NO;
+								Frame = "{{0, 0}, {952, 321}}";
+								Split0 = {
+									Frame = "{{0, 24}, {952, 297}}";
+									Split0 = {
+										Frame = "{{0, 0}, {468, 297}}";
+									};
+									Split1 = {
+										DebugVariablesTableConfiguration = (
+											Name,
+											126.803,
+											Value,
+											150.074,
+											Summary,
+											172.123,
+										);
+										Frame = "{{477, 0}, {475, 297}}";
+									};
+									SplitCount = 2;
+								};
+								SplitCount = 1;
+								Tab0 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								Tab1 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								TabCount = 2;
+								TabsVisible = YES;
+							};
+							Frame = "{{0, 0}, {952, 321}}";
+							LauncherConfigVersion = 7;
+						};
+						Tab1 = {
+							Frame = "{{0, 0}, {781, 452}}";
+							LauncherConfigVersion = 3;
+							Runner = {
+								Frame = "{{0, 0}, {781, 452}}";
+							};
+						};
+						Tab2 = {
+							BuildMessageFrame = "{{0, 0}, {687, 149}}";
+							BuildTranscriptFrame = "{{0, 158}, {687, 59}}";
+							Frame = "{{0, 0}, {685, 215}}";
+						};
+						Tab3 = {
+							Frame = "{{0, 0}, {612, 295}}";
+						};
+						TabCount = 4;
+						TabsVisible = NO;
+					};
+					SplitCount = 1;
+					Tab0 = {
+						Frame = "{{0, 0}, {300, 533}}";
+						GroupTreeTableConfiguration = (
+							SCMStatusColumn,
+							22,
+							TargetStatusColumn,
+							18,
+							MainColumn,
+							245,
+						);
+					};
+					Tab1 = {
+						ClassesFrame = "{{0, 0}, {280, 398}}";
+						ClassesTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXClassColumnIdentifier,
+							237,
+						);
+						Frame = "{{0, 0}, {278, 659}}";
+						MembersFrame = "{{0, 407}, {280, 252}}";
+						MembersTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXMethodColumnIdentifier,
+							236,
+						);
+					};
+					Tab2 = {
+						Frame = "{{0, 0}, {200, 100}}";
+					};
+					Tab3 = {
+						Frame = "{{0, 0}, {200, 100}}";
+						TargetTableConfiguration = (
+							ActiveObject,
+							16,
+							ObjectNames,
+							202.296,
+						);
+					};
+					Tab4 = {
+						BreakpointsTreeTableConfiguration = (
+							breakpointColumn,
+							197,
+							enabledColumn,
+							31,
+						);
+						Frame = "{{0, 0}, {250, 100}}";
+					};
+					TabCount = 5;
+					TabsVisible = NO;
+				};
+				StatusViewVisible = YES;
+				Template = F5314676015831810DCA290F;
+				ToolbarVisible = YES;
+				WindowLocation = "{7, 250}";
+			};
+			"PBXTemplateGeometry-F5534CB2020F3F8A0DCA290F" = {
+				ContentSize = "{594, 303}";
+				LeftSlideOut = {
+					Collapsed = NO;
+					Frame = "{{0, 23}, {594, 280}}";
+					Split0 = {
+						ActiveTab = 1;
+						Collapsed = YES;
+						Frame = "{{0, 0}, {594, 280}}";
+						Split0 = {
+							Frame = "{{1e+06, 1e+06}, {594, 0}}";
+						};
+						SplitCount = 1;
+						Tab0 = {
+							Debugger = {
+								Collapsed = NO;
+								Frame = "{{0, 0}, {804, 321}}";
+								Split0 = {
+									Frame = "{{0, 24}, {804, 297}}";
+									Split0 = {
+										Frame = "{{0, 0}, {394, 297}}";
+									};
+									Split1 = {
+										DebugVariablesTableConfiguration = (
+											Name,
+											123,
+											Value,
+											85,
+											Summary,
+											167.123,
+										);
+										Frame = "{{403, 0}, {401, 297}}";
+									};
+									SplitCount = 2;
+								};
+								SplitCount = 1;
+								Tab0 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								Tab1 = {
+									Frame = "{{0, 0}, {100, 50}}";
+								};
+								TabCount = 2;
+								TabsVisible = YES;
+							};
+							Frame = "{{0, 0}, {804, 321}}";
+							LauncherConfigVersion = 7;
+						};
+						Tab1 = {
+							Frame = "{{0, 0}, {594, 274}}";
+							LauncherConfigVersion = 3;
+							Runner = {
+								Frame = "{{0, 0}, {594, 274}}";
+							};
+						};
+						Tab2 = {
+							BuildMessageFrame = "{{0, 0}, {806, 237}}";
+							BuildTranscriptFrame = "{{0, 246}, {806, 3}}";
+							Frame = "{{0, 0}, {804, 247}}";
+						};
+						Tab3 = {
+							Frame = "{{0, 0}, {612, 295}}";
+						};
+						TabCount = 4;
+						TabsVisible = NO;
+					};
+					SplitCount = 1;
+					Tab0 = {
+						Frame = "{{0, 0}, {300, 533}}";
+						GroupTreeTableConfiguration = (
+							SCMStatusColumn,
+							22,
+							TargetStatusColumn,
+							18,
+							MainColumn,
+							245,
+						);
+					};
+					Tab1 = {
+						ClassesFrame = "{{0, 0}, {280, 398}}";
+						ClassesTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXClassColumnIdentifier,
+							237,
+						);
+						Frame = "{{0, 0}, {278, 659}}";
+						MembersFrame = "{{0, 407}, {280, 252}}";
+						MembersTreeTableConfiguration = (
+							PBXBookColumnIdentifier,
+							20,
+							PBXMethodColumnIdentifier,
+							236,
+						);
+					};
+					Tab2 = {
+						Frame = "{{0, 0}, {200, 100}}";
+					};
+					Tab3 = {
+						Frame = "{{0, 0}, {200, 386}}";
+						TargetTableConfiguration = (
+							ActiveObject,
+							16,
+							ObjectNames,
+							202.296,
+						);
+					};
+					Tab4 = {
+						BreakpointsTreeTableConfiguration = (
+							breakpointColumn,
+							197,
+							enabledColumn,
+							31,
+						);
+						Frame = "{{0, 0}, {250, 386}}";
+					};
+					TabCount = 5;
+					TabsVisible = NO;
+				};
+				StatusViewVisible = YES;
+				Template = F5534CB2020F3F8A0DCA290F;
+				ToolbarVisible = YES;
+				WindowLocation = "{4, 381}";
+			};
 			PBXWorkspaceContents = (
 				{
 					LeftSlideOut = {
 						Split0 = {
 							Split0 = {
 								NavContent0 = {
-									bookmark = F50D59E705CDA7DE017C67C1;
+									bookmark = F5D9F71005CF63CD017C67C1;
 									history = (
 										F5F16EF60527D1B401A80064,
 										F557060705C8B0C0017C67C1,
 										F50EB4AE05CB231C017C67C1,
 										F586ED0505CC1ED5017C67C1,
-										F5E2D67D05CDA550017C67C1,
 										F5E2D67E05CDA550017C67C1,
 										F5E2D67F05CDA550017C67C1,
 										F5E2D68005CDA550017C67C1,
-										F5E2D68705CDA550017C67C1,
+										F5D9F70E05CF63CD017C67C1,
+										F58F331A05CF5079017C67C1,
 									);
 									prevStack = (
 										F5F16EF80527D1B401A80064,
@@ -87,6 +335,17 @@
 										F5E2D68405CDA550017C67C1,
 										F5E2D68505CDA550017C67C1,
 										F5E2D68605CDA550017C67C1,
+										F58F331C05CF5079017C67C1,
+										F58F331D05CF5079017C67C1,
+										F58F331E05CF5079017C67C1,
+										F58F331F05CF5079017C67C1,
+										F58F332005CF5079017C67C1,
+										F58F332105CF5079017C67C1,
+										F58F332205CF5079017C67C1,
+										F58F332305CF5079017C67C1,
+										F58F332405CF5079017C67C1,
+										F58F332505CF5079017C67C1,
+										F5D9F70F05CF63CD017C67C1,
 									);
 								};
 								NavCount = 1;
@@ -155,6 +414,41 @@
 						TabCount = 5;
 					};
 				},
+				{
+					LeftSlideOut = {
+						Split0 = {
+							Split0 = {
+								NavCount = 1;
+								NavGeometry0 = {
+									Frame = "{{0, 0}, {594, 150}}";
+									NavBarVisible = YES;
+								};
+							};
+							SplitCount = 1;
+							Tab0 = {
+								Debugger = {
+									Split0 = {
+										SplitCount = 2;
+									};
+									SplitCount = 1;
+									TabCount = 2;
+								};
+								LauncherConfigVersion = 7;
+							};
+							Tab1 = {
+								LauncherConfigVersion = 3;
+								Runner = {
+								};
+							};
+							TabCount = 4;
+						};
+						SplitCount = 1;
+						Tab1 = {
+							OptionsSetName = "Hierarchy, all classes";
+						};
+						TabCount = 5;
+					};
+				},
 			);
 			PBXWorkspaceGeometries = (
 				{
@@ -403,14 +697,135 @@
 					ToolbarVisible = YES;
 					WindowLocation = "{7, 250}";
 				},
+				{
+					ContentSize = "{594, 303}";
+					LeftSlideOut = {
+						Collapsed = NO;
+						Frame = "{{0, 23}, {594, 280}}";
+						Split0 = {
+							ActiveTab = 1;
+							Collapsed = YES;
+							Frame = "{{0, 0}, {594, 280}}";
+							Split0 = {
+								Frame = "{{1e+06, 1e+06}, {594, 0}}";
+							};
+							SplitCount = 1;
+							Tab0 = {
+								Debugger = {
+									Collapsed = NO;
+									Frame = "{{0, 0}, {804, 321}}";
+									Split0 = {
+										Frame = "{{0, 24}, {804, 297}}";
+										Split0 = {
+											Frame = "{{0, 0}, {394, 297}}";
+										};
+										Split1 = {
+											DebugVariablesTableConfiguration = (
+												Name,
+												123,
+												Value,
+												85,
+												Summary,
+												167.123,
+											);
+											Frame = "{{403, 0}, {401, 297}}";
+										};
+										SplitCount = 2;
+									};
+									SplitCount = 1;
+									Tab0 = {
+										Frame = "{{0, 0}, {100, 50}}";
+									};
+									Tab1 = {
+										Frame = "{{0, 0}, {100, 50}}";
+									};
+									TabCount = 2;
+									TabsVisible = YES;
+								};
+								Frame = "{{0, 0}, {804, 321}}";
+								LauncherConfigVersion = 7;
+							};
+							Tab1 = {
+								Frame = "{{0, 0}, {594, 274}}";
+								LauncherConfigVersion = 3;
+								Runner = {
+									Frame = "{{0, 0}, {594, 274}}";
+								};
+							};
+							Tab2 = {
+								BuildMessageFrame = "{{0, 0}, {806, 237}}";
+								BuildTranscriptFrame = "{{0, 246}, {806, 3}}";
+								Frame = "{{0, 0}, {804, 247}}";
+							};
+							Tab3 = {
+								Frame = "{{0, 0}, {612, 295}}";
+							};
+							TabCount = 4;
+							TabsVisible = NO;
+						};
+						SplitCount = 1;
+						Tab0 = {
+							Frame = "{{0, 0}, {300, 533}}";
+							GroupTreeTableConfiguration = (
+								TargetStatusColumn,
+								18,
+								MainColumn,
+								267,
+							);
+						};
+						Tab1 = {
+							ClassesFrame = "{{0, 0}, {280, 398}}";
+							ClassesTreeTableConfiguration = (
+								PBXBookColumnIdentifier,
+								20,
+								PBXClassColumnIdentifier,
+								237,
+							);
+							Frame = "{{0, 0}, {278, 659}}";
+							MembersFrame = "{{0, 407}, {280, 252}}";
+							MembersTreeTableConfiguration = (
+								PBXBookColumnIdentifier,
+								20,
+								PBXMethodColumnIdentifier,
+								236,
+							);
+						};
+						Tab2 = {
+							Frame = "{{0, 0}, {200, 100}}";
+						};
+						Tab3 = {
+							Frame = "{{0, 0}, {200, 386}}";
+							TargetTableConfiguration = (
+								ActiveObject,
+								16,
+								ObjectNames,
+								202.296,
+							);
+						};
+						Tab4 = {
+							BreakpointsTreeTableConfiguration = (
+								breakpointColumn,
+								197,
+								enabledColumn,
+								31,
+							);
+							Frame = "{{0, 0}, {250, 386}}";
+						};
+						TabCount = 5;
+						TabsVisible = NO;
+					};
+					StatusViewVisible = YES;
+					Template = F5534CB2020F3F8A0DCA290F;
+					ToolbarVisible = YES;
+					WindowLocation = "{4, 381}";
+				},
 			);
-			PBXWorkspaceStateSaveDate = 97363921;
+			PBXWorkspaceStateSaveDate = 97476936;
 		};
 		perUserProjectItems = {
 			F508F40305A7AE8A01A80064 = F508F40305A7AE8A01A80064;
 			F508F40405A7AE8A01A80064 = F508F40405A7AE8A01A80064;
 			F508F40505A7AE8A01A80064 = F508F40505A7AE8A01A80064;
-			F50D59E705CDA7DE017C67C1 = F50D59E705CDA7DE017C67C1;
 			F50EB4AE05CB231C017C67C1 = F50EB4AE05CB231C017C67C1;
 			F50EB4AF05CB231C017C67C1 = F50EB4AF05CB231C017C67C1;
 			F51C069F05C4C5B4017C67C1 = F51C069F05C4C5B4017C67C1;
@@ -456,9 +871,22 @@
 			F586ED1205CC1ED5017C67C1 = F586ED1205CC1ED5017C67C1;
 			F586ED1305CC1ED5017C67C1 = F586ED1305CC1ED5017C67C1;
 			F586ED1405CC1ED5017C67C1 = F586ED1405CC1ED5017C67C1;
+			F58F331A05CF5079017C67C1 = F58F331A05CF5079017C67C1;
+			F58F331C05CF5079017C67C1 = F58F331C05CF5079017C67C1;
+			F58F331D05CF5079017C67C1 = F58F331D05CF5079017C67C1;
+			F58F331E05CF5079017C67C1 = F58F331E05CF5079017C67C1;
+			F58F331F05CF5079017C67C1 = F58F331F05CF5079017C67C1;
+			F58F332005CF5079017C67C1 = F58F332005CF5079017C67C1;
+			F58F332105CF5079017C67C1 = F58F332105CF5079017C67C1;
+			F58F332205CF5079017C67C1 = F58F332205CF5079017C67C1;
+			F58F332305CF5079017C67C1 = F58F332305CF5079017C67C1;
+			F58F332405CF5079017C67C1 = F58F332405CF5079017C67C1;
+			F58F332505CF5079017C67C1 = F58F332505CF5079017C67C1;
 			F5CCE1EA05CCCE05017C67C1 = F5CCE1EA05CCCE05017C67C1;
 			F5CCE1EB05CCCE05017C67C1 = F5CCE1EB05CCCE05017C67C1;
-			F5E2D67D05CDA550017C67C1 = F5E2D67D05CDA550017C67C1;
+			F5D9F70E05CF63CD017C67C1 = F5D9F70E05CF63CD017C67C1;
+			F5D9F70F05CF63CD017C67C1 = F5D9F70F05CF63CD017C67C1;
+			F5D9F71005CF63CD017C67C1 = F5D9F71005CF63CD017C67C1;
 			F5E2D67E05CDA550017C67C1 = F5E2D67E05CDA550017C67C1;
 			F5E2D67F05CDA550017C67C1 = F5E2D67F05CDA550017C67C1;
 			F5E2D68005CDA550017C67C1 = F5E2D68005CDA550017C67C1;
@@ -467,7 +895,6 @@
 			F5E2D68405CDA550017C67C1 = F5E2D68405CDA550017C67C1;
 			F5E2D68505CDA550017C67C1 = F5E2D68505CDA550017C67C1;
 			F5E2D68605CDA550017C67C1 = F5E2D68605CDA550017C67C1;
-			F5E2D68705CDA550017C67C1 = F5E2D68705CDA550017C67C1;
 			F5F16EF60527D1B401A80064 = F5F16EF60527D1B401A80064;
 			F5F16EF80527D1B401A80064 = F5F16EF80527D1B401A80064;
 			F5F16EF90527D1B401A80064 = F5F16EF90527D1B401A80064;
@@ -504,7 +931,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 480";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 2445;
 		vrLoc = 5977;
@@ -523,16 +950,6 @@
 		isa = PBXTargetBookmark;
 		trg = 29B97326FDCFA39411CA2CEA;
 	};
-	F50D59E705CDA7DE017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 73";
-		rLen = 0;
-		rLoc = 3400;
-		rType = 0;
-		vrLen = 2252;
-		vrLoc = 0;
-	};
 	F50EB4AE05CB231C017C67C1 = {
 		fRef = F508F3FF05A7A82F01A80064;
 		isa = PBXTextBookmark;
@@ -558,7 +975,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 564";
 		rLen = 0;
-		rLoc = 24441;
+		rLoc = 23133;
 		rType = 0;
 		vrLen = 1497;
 		vrLoc = 0;
@@ -598,7 +1015,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 328";
 		rLen = 0;
-		rLoc = 14218;
+		rLoc = 13341;
 		rType = 0;
 		vrLen = 1498;
 		vrLoc = 0;
@@ -612,7 +1029,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 480";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 1744;
 		vrLoc = 189;
@@ -622,7 +1039,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 190";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 1958;
 		vrLoc = 8259;
@@ -632,7 +1049,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 188";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 2222;
 		vrLoc = 8371;
@@ -642,7 +1059,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 434";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 1792;
 		vrLoc = 0;
@@ -670,7 +1087,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 434";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 1792;
 		vrLoc = 0;
@@ -684,7 +1101,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 193";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 1413;
 		vrLoc = 2970;
@@ -708,7 +1125,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 499";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 1552;
 		vrLoc = 0;
@@ -732,7 +1149,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 499";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 1552;
 		vrLoc = 0;
@@ -756,7 +1173,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 554";
 		rLen = 0;
-		rLoc = 24441;
+		rLoc = 23133;
 		rType = 0;
 		vrLen = 1511;
 		vrLoc = 14316;
@@ -794,7 +1211,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 556";
 		rLen = 0;
-		rLoc = 24441;
+		rLoc = 23133;
 		rType = 0;
 		vrLen = 1495;
 		vrLoc = 0;
@@ -804,7 +1221,7 @@
 		isa = PBXTextBookmark;
 		name = "preferences.applescript: 8";
 		rLen = 0;
-		rLoc = 3400;
+		rLoc = 5906;
 		rType = 0;
 		vrLen = 157;
 		vrLoc = 0;
@@ -814,7 +1231,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 245";
 		rLen = 0;
-		rLoc = 11386;
+		rLoc = 10769;
 		rType = 0;
 		vrLen = 1811;
 		vrLoc = 11141;
@@ -824,7 +1241,7 @@
 		isa = PBXTextBookmark;
 		name = "preferences.applescript: 11";
 		rLen = 0;
-		rLoc = 3400;
+		rLoc = 5906;
 		rType = 0;
 		vrLen = 459;
 		vrLoc = 0;
@@ -834,7 +1251,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 245";
 		rLen = 0;
-		rLoc = 11386;
+		rLoc = 10769;
 		rType = 0;
 		vrLen = 1795;
 		vrLoc = 11141;
@@ -844,7 +1261,7 @@
 		isa = PBXTextBookmark;
 		name = "preferences.applescript: 26";
 		rLen = 0;
-		rLoc = 1462;
+		rLoc = 2231;
 		rType = 0;
 		vrLen = 1745;
 		vrLoc = 0;
@@ -854,7 +1271,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 245";
 		rLen = 0;
-		rLoc = 11386;
+		rLoc = 10769;
 		rType = 0;
 		vrLen = 1773;
 		vrLoc = 9896;
@@ -864,7 +1281,7 @@
 		isa = PBXTextBookmark;
 		name = "preferences.applescript: 19";
 		rLen = 0;
-		rLoc = 936;
+		rLoc = 1427;
 		rType = 0;
 		vrLen = 1970;
 		vrLoc = 0;
@@ -874,7 +1291,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 528";
 		rLen = 1109;
-		rLoc = 22625;
+		rLoc = 21317;
 		rType = 0;
 		vrLen = 2083;
 		vrLoc = 20945;
@@ -884,7 +1301,7 @@
 		isa = PBXTextBookmark;
 		name = "preferences.applescript: 59";
 		rLen = 0;
-		rLoc = 3400;
+		rLoc = 5906;
 		rType = 0;
 		vrLen = 2167;
 		vrLoc = 616;
@@ -894,7 +1311,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 543";
 		rLen = 543;
-		rLoc = 23735;
+		rLoc = 22427;
 		rType = 0;
 		vrLen = 2083;
 		vrLoc = 20945;
@@ -904,7 +1321,7 @@
 		isa = PBXTextBookmark;
 		name = "preferences.applescript: 73";
 		rLen = 0;
-		rLoc = 3400;
+		rLoc = 5906;
 		rType = 0;
 		vrLen = 2426;
 		vrLoc = 370;
@@ -914,7 +1331,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 557";
 		rLen = 0;
-		rLoc = 24441;
+		rLoc = 23133;
 		rType = 0;
 		vrLen = 2221;
 		vrLoc = 21697;
@@ -923,12 +1340,122 @@
 		isa = PBXTargetBookmark;
 		trg = 29B97326FDCFA39411CA2CEA;
 	};
+	F58F331A05CF5079017C67C1 = {
+		fRef = DA206CF3015C4E8B03C91932;
+		isa = PBXTextBookmark;
+		name = "MacGPSBabel.applescript: 41";
+		rLen = 0;
+		rLoc = 1009;
+		rType = 0;
+		vrLen = 1835;
+		vrLoc = 282;
+	};
+	F58F331C05CF5079017C67C1 = {
+		fRef = F586ED0005CB576C017C67C1;
+		isa = PBXTextBookmark;
+		name = "preferences.applescript: 73";
+		rLen = 0;
+		rLoc = 5906;
+		rType = 0;
+		vrLen = 2252;
+		vrLoc = 0;
+	};
+	F58F331D05CF5079017C67C1 = {
+		fRef = DA206CF3015C4E8B03C91932;
+		isa = PBXTextBookmark;
+		name = "MacGPSBabel.applescript: 577";
+		rLen = 0;
+		rLoc = 23133;
+		rType = 0;
+		vrLen = 1728;
+		vrLoc = 16243;
+	};
+	F58F331E05CF5079017C67C1 = {
+		fRef = F586ED0005CB576C017C67C1;
+		isa = PBXTextBookmark;
+		name = "preferences.applescript: 73";
+		rLen = 0;
+		rLoc = 5906;
+		rType = 0;
+		vrLen = 2252;
+		vrLoc = 0;
+	};
+	F58F331F05CF5079017C67C1 = {
+		fRef = DA206CF3015C4E8B03C91932;
+		isa = PBXTextBookmark;
+		name = "MacGPSBabel.applescript: 577";
+		rLen = 0;
+		rLoc = 23133;
+		rType = 0;
+		vrLen = 1774;
+		vrLoc = 13079;
+	};
+	F58F332005CF5079017C67C1 = {
+		fRef = F586ED0005CB576C017C67C1;
+		isa = PBXTextBookmark;
+		name = "preferences.applescript: 38";
+		rLen = 0;
+		rLoc = 2231;
+		rType = 0;
+		vrLen = 2277;
+		vrLoc = 1396;
+	};
+	F58F332105CF5079017C67C1 = {
+		fRef = DA206CF3015C4E8B03C91932;
+		isa = PBXTextBookmark;
+		name = "MacGPSBabel.applescript: 32";
+		rLen = 14;
+		rLoc = 995;
+		rType = 0;
+		vrLen = 2064;
+		vrLoc = 332;
+	};
+	F58F332205CF5079017C67C1 = {
+		fRef = F586ED0005CB576C017C67C1;
+		isa = PBXTextBookmark;
+		name = "preferences.applescript: 53";
+		rLen = 0;
+		rLoc = 3429;
+		rType = 0;
+		vrLen = 2194;
+		vrLoc = 205;
+	};
+	F58F332305CF5079017C67C1 = {
+		fRef = DA206CF3015C4E8B03C91932;
+		isa = PBXTextBookmark;
+		name = "MacGPSBabel.applescript: 318";
+		rLen = 0;
+		rLoc = 13341;
+		rType = 0;
+		vrLen = 1766;
+		vrLoc = 13015;
+	};
+	F58F332405CF5079017C67C1 = {
+		fRef = F586ED0005CB576C017C67C1;
+		isa = PBXTextBookmark;
+		name = "preferences.applescript: 38";
+		rLen = 0;
+		rLoc = 2176;
+		rType = 0;
+		vrLen = 2024;
+		vrLoc = 1122;
+	};
+	F58F332505CF5079017C67C1 = {
+		fRef = DA206CF3015C4E8B03C91932;
+		isa = PBXTextBookmark;
+		name = "MacGPSBabel.applescript: 41";
+		rLen = 0;
+		rLoc = 1009;
+		rType = 0;
+		vrLen = 1835;
+		vrLoc = 282;
+	};
 	F5CCE1EA05CCCE05017C67C1 = {
 		fRef = DA206CF3015C4E8B03C91932;
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 556";
 		rLen = 0;
-		rLoc = 24441;
+		rLoc = 23133;
 		rType = 0;
 		vrLen = 1497;
 		vrLoc = 0;
@@ -938,20 +1465,40 @@
 		isa = PBXTextBookmark;
 		name = "preferences.applescript: 73";
 		rLen = 0;
-		rLoc = 3400;
+		rLoc = 5906;
 		rType = 0;
 		vrLen = 2273;
 		vrLoc = 0;
 	};
-	F5E2D67D05CDA550017C67C1 = {
+	F5D9F70E05CF63CD017C67C1 = {
+		fRef = F586ED0005CB576C017C67C1;
+		isa = PBXTextBookmark;
+		name = "preferences.applescript: 144";
+		rLen = 0;
+		rLoc = 5906;
+		rType = 0;
+		vrLen = 1911;
+		vrLoc = 3995;
+	};
+	F5D9F70F05CF63CD017C67C1 = {
+		fRef = F586ED0005CB576C017C67C1;
+		isa = PBXTextBookmark;
+		name = "preferences.applescript: 144";
+		rLen = 0;
+		rLoc = 5906;
+		rType = 0;
+		vrLen = 1911;
+		vrLoc = 3995;
+	};
+	F5D9F71005CF63CD017C67C1 = {
 		fRef = DA206CF3015C4E8B03C91932;
 		isa = PBXTextBookmark;
-		name = "MacGPSBabel.applescript: 577";
+		name = "MacGPSBabel.applescript: 543";
 		rLen = 0;
-		rLoc = 24441;
+		rLoc = 23133;
 		rType = 0;
-		vrLen = 1728;
-		vrLoc = 16243;
+		vrLen = 1598;
+		vrLoc = 13210;
 	};
 	F5E2D67E05CDA550017C67C1 = {
 		fRef = F5E2D68A05CDA550017C67C1;
@@ -979,7 +1526,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 577";
 		rLen = 0;
-		rLoc = 24441;
+		rLoc = 23133;
 		rType = 0;
 		vrLen = 1728;
 		vrLoc = 16243;
@@ -989,7 +1536,7 @@
 		isa = PBXTextBookmark;
 		name = "preferences.applescript: 73";
 		rLen = 0;
-		rLoc = 3400;
+		rLoc = 5906;
 		rType = 0;
 		vrLen = 2252;
 		vrLoc = 0;
@@ -1015,16 +1562,6 @@
 		glyphRangeLocation = 0;
 		isa = DVDocBookmark;
 	};
-	F5E2D68705CDA550017C67C1 = {
-		fRef = F586ED0005CB576C017C67C1;
-		isa = PBXTextBookmark;
-		name = "preferences.applescript: 73";
-		rLen = 0;
-		rLoc = 3400;
-		rType = 0;
-		vrLen = 2252;
-		vrLoc = 0;
-	};
 	F5E2D68805CDA550017C67C1 = {
 		isa = PBXFileReference;
 		name = index.html;
@@ -1071,7 +1608,7 @@
 		isa = PBXTextBookmark;
 		name = "MacGPSBabel.applescript: 111";
 		rLen = 0;
-		rLoc = 3813;
+		rLoc = 3196;
 		rType = 0;
 		vrLen = 1256;
 		vrLoc = 3068;
diff --git a/gpsbabel/macgpsbabel/preferences.applescript b/gpsbabel/macgpsbabel/preferences.applescript
index 789a72955..743b59ab5 100644
--- a/gpsbabel/macgpsbabel/preferences.applescript
+++ b/gpsbabel/macgpsbabel/preferences.applescript
@@ -1,18 +1,30 @@
 -- preferences.applescript
 -- MacGPSBabel
 
+-- This script deals mostly with reading and saving user defaults. Along the way, it also deals with getting the list of available serial ports.
+
 --  Created by Jeremy Atherton on Fri Jan 30 2004.
 --  Copyright (c) 2004 Jeremy Atherton.
 
+-- PROPERTIES --
 property startIndex : 0
 property startState : false
 
+-- EVENT HANDLERS --
+
 on will finish launching theObject
+	
+	-- make empty entries in user defaults
 	make new default entry at end of default entries of user defaults with properties {name:"theInputType", contents:startIndex}
 	make new default entry at end of default entries of user defaults with properties {name:"theOutputType", contents:startIndex}
 	make new default entry at end of default entries of user defaults with properties {name:"gpsIN", contents:startState}
 	make new default entry at end of default entries of user defaults with properties {name:"gpsOUT", contents:startState}
+	make new default entry at end of default entries of user defaults with properties {name:"gpsReceiver", contents:startIndex}
+	
+	-- read current user defaults
 	my readSettings()
+	
+	-- deal with changes to MacGPSBabel window needed if any of the GPS check boxes are checked by default
 	if state of button "GPSswitchIN" of window "MacGPSBabel" is equal to 1 then
 		my gpsIN()
 	end if
@@ -21,19 +33,41 @@ on will finish launching theObject
 	end if
 end will finish launching
 
-on readSettings()
-	tell user defaults
-		set defaultInputIndex to contents of default entry "theInputType"
-		set defaultOutputIndex to contents of default entry "theOutputType"
-		set defaultgpsIN to contents of default entry "gpsIN" as boolean
-		set defaultgpsOUT to contents of default entry "gpsOUT" as boolean
-	end tell
-	set contents of popup button "inPop" of window "MacGPSBabel" to defaultInputIndex
-	set contents of popup button "outPop" of window "MacGPSBabel" to defaultOutputIndex
-	set state of button "GPSswitchIN" of window "MacGPSBabel" to defaultgpsIN
-	set state of button "GPSswitchOUT" of window "MacGPSBabel" to defaultgpsOUT
-end readSettings
+on will open theObject
+	if theObject is window "SelectGPS" then
+		-- get the list of available serial ports
+		set popList to my getSerial()
+		-- use popList to populate the drop-down menu
+		delete every menu item of menu of popup button "serialPop" of window "SelectGPS"
+		repeat with i in popList
+			make new menu item at the end of menu items of menu of popup button "serialPop" of window "SelectGPS" with properties {title:i, enabled:true}
+		end repeat
+		
+		-- read user defaults for this window
+		tell user defaults
+			set defaultgpsReceiver to contents of default entry "gpsReceiver"
+		end tell
+		set state of popup button "gpsPop" of window "SelectGPS" to defaultgpsReceiver
+		
+		-- hide MacGPSBabel window
+		set visible of window "MacGPSBabel" to false
+	end if
+end will open
+
+on will close theObject
+	if theObject is window "SelectGPS" then
+		-- store user defaults for this window
+		set newReceiverIndex to contents of popup button "gpsPop" of window "SelectGPS"
+		tell user defaults
+			set contents of default entry "gpsReceiver" to newReceiverIndex
+		end tell
+		
+		-- unhide MacGPSBabel window
+		set visible of window "MacGPSBabel" to true
+	end if
+end will close
 
+-- store user defaults for MacGPSBabel window
 on clicked theObject
 	if theObject is button "defaultsButton" of window "MacGPSBabel" then
 		set newInputIndex to contents of popup button "inPop" of window "MacGPSBabel"
@@ -49,6 +83,23 @@ on clicked theObject
 	end if
 end clicked
 
+-- HANDLERS --
+
+-- read user defaults
+on readSettings()
+	tell user defaults
+		set defaultInputIndex to contents of default entry "theInputType"
+		set defaultOutputIndex to contents of default entry "theOutputType"
+		set defaultgpsIN to contents of default entry "gpsIN" as boolean
+		set defaultgpsOUT to contents of default entry "gpsOUT" as boolean
+	end tell
+	set contents of popup button "inPop" of window "MacGPSBabel" to defaultInputIndex
+	set contents of popup button "outPop" of window "MacGPSBabel" to defaultOutputIndex
+	set state of button "GPSswitchIN" of window "MacGPSBabel" to defaultgpsIN
+	set state of button "GPSswitchOUT" of window "MacGPSBabel" to defaultgpsOUT
+end readSettings
+
+-- scripts for dealing with GPS checkboxes on MacGPSBabel window
 on gpsIN()
 	if state of button "GPSswitchIN" of window "MacGPSBabel" = 1 then
 		set enabled of button "selectButton" of window "MacGPSBabel" to false
@@ -70,4 +121,24 @@ on gpsOUT()
 	else
 		set enabled of popup button "outPop" of window "MacGPSBabel" to true
 	end if
-end gpsOUT
\ No newline at end of file
+end gpsOUT
+
+-- find the serial ports
+on getSerial()
+	set myList to {}
+	set theScript to "cd /dev; ls | grep cu..."
+	set scriptOut to (do shell script theScript) as string
+	set theCount to count of words in scriptOut
+	set i to 0
+	repeat until i = theCount
+		set i to i + 1
+		set defaultDelimiters to AppleScript's text item delimiters
+		set AppleScript's text item delimiters to {"."}
+		set theWords to the count of text items in word i of scriptOut
+		set z to 2
+		set the end of myList to (text items z thru theWords of word i of scriptOut) as string
+		set AppleScript's text item delimiters to defaultDelimiters
+	end repeat
+	set AppleScript's text item delimiters to {" "}
+	return myList
+end getSerial
\ No newline at end of file
-- 
2.30.2